Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Dec 2011 05:34:22 +0000 (21:34 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Dec 2011 05:34:22 +0000 (21:34 -0800)

Trivial merge